From 31960ef4537fd485f2b2f80077b7c07f7d0ab56e Mon Sep 17 00:00:00 2001 From: Jan Beulich Date: Fri, 22 Jun 2012 10:05:05 +0200 Subject: [PATCH] x86-64: revert mmconfig part of c/s 24425:053a44894279 These additions did not fulfill their purpose - they checked hypervisor config space accesses instead of guest (Dom0) ones. Signed-off-by: Jan Beulich Acked-by: Keir Fraser --- xen/arch/x86/x86_64/mmconfig_64.c | 13 ------------- 1 file changed, 13 deletions(-) diff --git a/xen/arch/x86/x86_64/mmconfig_64.c b/xen/arch/x86/x86_64/mmconfig_64.c index f2e7fedfec..16d432ed3a 100644 --- a/xen/arch/x86/x86_64/mmconfig_64.c +++ b/xen/arch/x86/x86_64/mmconfig_64.c @@ -14,7 +14,6 @@ #include #include #include -#include #include "mmconfig.h" @@ -59,7 +58,6 @@ int pci_mmcfg_read(unsigned int seg, unsigned int bus, unsigned int devfn, int reg, int len, u32 *value) { char __iomem *addr; - uint32_t mbdf; /* Why do we have this when nobody checks it. How about a BUG()!? -AK */ if (unlikely((bus > 255) || (devfn > 255) || (reg > 4095))) { @@ -67,12 +65,6 @@ err: *value = -1; return -EINVAL; } - mbdf = (seg << 16) | (bus << 8) | devfn; - if (xsm_pci_config_permission(current->domain, mbdf, reg, reg + len - 1, 0)) { - *value = -1; - return -EPERM; - } - addr = pci_dev_base(seg, bus, devfn); if (!addr) goto err; @@ -96,16 +88,11 @@ int pci_mmcfg_write(unsigned int seg, unsigned int bus, unsigned int devfn, int reg, int len, u32 value) { char __iomem *addr; - uint32_t mbdf; /* Why do we have this when nobody checks it. How about a BUG()!? -AK */ if (unlikely((bus > 255) || (devfn > 255) || (reg > 4095))) return -EINVAL; - mbdf = (seg << 16) | (bus << 8) | devfn; - if (xsm_pci_config_permission(current->domain, mbdf, reg, reg + len - 1, 1)) - return -EPERM; - addr = pci_dev_base(seg, bus, devfn); if (!addr) return -EINVAL; -- 2.30.2